merge release-1.2.1 branch