Merge "cm: bump version" into mr1-staging