Merge branch 'hotfix/release-11.1'
Removed views_charts causing WSOD on live
Merge branch 'hotfix/release-11.2' into develop