PBI-10 Approval: aoi 2.9.2_1 (josh)