updated to version 7.x-0.21
Merge branch 'release/7.x-0.21' into develop
Merge remote-tracking branch 'origin/develop' into feature/1082-material_types