Build failures in v4.14.y, v4.19.y, v5.0.y, v5.1.y