Update CMDataStorage up to 1.2.0
Merge pull request #6953 from mureev/master

Update CMDataStorage up to 1.2.0