Merge branch 'master' into develop
case 3183 - Modifying the content appearance or not of Other materialtypes
case 3183 - Adding preventive checks for variables' existence
case 3183 - Correcting if checks.
Merge remote-tracking branch 'origin/case-3183' into easy