PBI-10 Approval: gdado 2.2_6 (josh)