[backfire/packages] git: merge r29036