- 1.8.3 backports