Merge branch 'release/2.1' into dev
Updated data model version and app version
Merge branch 'release/2.1.1'