Backport 1.0.13 (2)

Additional backported commits for 1.0.13 from 1.1.8+