Merge branch 'hotfix/hotfix'
OCS Inventory integration fix
Hotfix 1.0.1
Merge branch 'hotfix/hotfix' into develop