execute same changes as for 1.2 on master.