OSPI July bugs 161722