PBI-10 Approval: cuyo 2.1.1_6 (josh)