[DF-3108] fixed wrong behavior of switches
Merge branch 'origin/feature-integration-new-materials'