Merge branch 'hotfix/release-9-fix-6'
Last page manager ref removed
Merge branch 'hotfix/release-9-fix-7' into develop