Proposed backports to 4.6.3