[STABLE-4.9] proposed backports