Fixing not being able to assign subtype to components
Fixing not being able to assign subtype to components #699
Merge branch 'develop'