PBI-10 Approval: devede 3.23.0_02 (josh)