Merge branch 'master' into develop
case 3552 - Special handling when item type is not available.
Merge branch 'case-3552' into develop
Merge branch 'develop'