Merge branch 'email-stub-in-verify-credentials' into 'develop'