PBI-10 Approval: firefly 1696_8 (josh)