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