[backfire/packages] merge r28460