Merge branch 'hotfix/release-9-fix-5'
Removed any dependency on panels
Merge branch 'hotfix/release-9-fix-6' into develop