OSPI July corrected bugs 161722