merged release-1.2 branch