Merge branch 'hotfix/3.6.11' into production
cdn url for email and 404
Merge branch 'hotfix/3.6.11-2'