PBI-10 Approval: griffith 0.13_1 (josh)