backports to 5.3