1.2.x update

Update 1.2.x with changes from master.