OCCPI September bugs 18322