Merge branch 'hotfix/release-10-fix-2'
Removed all components from fsp_types feature
Merge branch 'hotfix/release-10-fix-3' into develop