Merge branch 'master' into develop
case 3552 - Do not show empty item types as '0'.
Merge branch 'case-3552' into develop
Merge branch 'develop'