PBI-10 Approval: ceferino 0.97.8_12 (josh)