Move 1.2 final bug fixes to 1.2.1 branch