PBI-9 Approval: eric 4.5.16 (amd64)