Backports for 4.6