Please apply commit d1e20222d537 to 4.14.y and 4.18.y