PBI-10 Approval: aoi 3.0 (josh)