Merge branch 'apps-verify-credentials' into 'develop'