Merge branch 'hotfix/release-9-fix-3'
Removed views-generated blocks from fsp_structure feature
Merge branch 'hotfix/release-9-fix-4' into develop