Please apply commit cf0d53ba4947 and 523184972b28 to v4.4.y, v4.9.y, v4.14.y