Merge branch 'hotfix/hotfix'
OCS Inventory integration test
Merge branch 'hotfix/hotfix' into develop