Merge "Upgrade SNAPSHOT to 1.2.2"