Merge branch 'FTR-50-WORKSPACE-VIEWS' into FTR-44_material-editor
Merge branch 'FTR-44_material-editor' into FTR-50-WORKSPACE-VIEWS