Merge branch 'master' into develop
case 3196 - Get rid of notices when rendering ting entities.
Merge branch 'case-3196' into develop
case 3183 - Modifying the content appearance or not of Other material types.
case 3183 - Remove block if no items available.
Merge remote-tracking branch 'origin/case-3183' into develop
Merge branch 'develop'