PBI-10 Approval: gl-117 1.3.2_8 (josh)