PBI-9 Approval: josm 5990 (amd64)