PBI-10 Approval: boswars 2.6.1_4 (josh)