1.2.x - Apply bugfixes from 1.2.x to master.