Merge "Cleanup around partition sizes" into main