Merge changes for 1.2.3