Merge remote-tracking branch 'origin/feature/10462_sxdmdnorm_integration'
Merge remote-tracking branch 'origin/feature/10377_sample_material_ui'
Refs #10546 Added new definition file
Merge branch 'bugfix/10546_new_BASIS_deffile' into develop