This needs to be hidden when the site loads
Merge branch 'hotfix/1.5.11'