Merge remote branch 'origin/feature/7256_SCDCalibImprov1'
re #7285 changed to inout ws, added grouping and doc
Merge branch 'feature/7285_SetSampleMaterial_imp' into develop