Backport missing commits from 1.2.x branch to master

Some are missing before we can do the 1.3 release with all available bugfixes.

There is further development in 1.3 (master) that is not suitable for 1.2 branch.