Removed last structure feature components
Merge branch 'hotfix/release-10-fix-2'