PBI-10 Approval: marble 4.12.3 (josh)