[STABLE-4.4] proposed backports