Merge release-1.2 and disable r53