Merge changes for release 1.2.2