[backfire/packages]: php5: merge r28509 and r28510 (#9839)