Merge branch 'release/1.1.2' into develop
Fix for missing type_id
version 1.1.2.1
Merge branch 'release/1.1.2.1'