1.9.1 Backports