fixed app id
Merge branch 'develop' into release-2.1
Merge branch 'release-2.1'