[backfire/packages] wshaper: merge r28456