Backport relevant parts of bugfixes [ad22262328b3], [61fdd06833a6] and [4add05447ca0] to branch 1.2 (#623)
1 3ed8f7c8bed8f51aecdc8395aa11af2f1fa12d9f r1.2
2 ffc2d2559fc916e90c3f000582a2d4761d229d44 r1.2.1
3 d303bfa8b1edf141856665fb73fddcc6abc33fef r1.2.2
4 9e587caed9537aeb01a855749b5919ee3e005911 r1.2.3
5 e13061207f85ee5f428855b83b2fe3a3ad62a26c r1.2.4