PT-49873321 - Change default partitioning based on Matt Keys' recommendations