PBI-10 Approval: emerald 0.8.4_7 (josh)