Merge branch 'hotfix-2.5.3'
favicon sitemap robot and some fiexes
Merge branch 'hotfix-2.6.0' into develop