core-4771 core-4772 fix validation in app integration
Merge branch 'master' into STABLE