PBI-10 Approval: josm 6891 (josh)