Merge branch 'hotfix/404Fixed'
404 improved.
Merge branch 'hotfix/404Improved' into develop