Apply 1.3.x percentiles fix to 1.4.x