merging changes for 1.2.2