Please include 66b20ac0a1a10769d059d6903202f53494e3d902 in 5.1 and 5.2