PBI-10 Approval: cannonsmash 0.6.6_17 (josh)