Merge branch 'hotfix/sitemap-fix'
Merge branch 'master' into develop