Merge remote-tracking branch 'origin/feature/6594_add_sans2d_ev'
Merge remote-tracking branch 'origin/feature/4870_res_file_type_option'
Merge remote-tracking branch 'origin/feature/7502_test_combine_multi'
Merge remote-tracking branch 'origin/feature/7309_rename_ws_duplicate_name'
Changed to file properties in DGS. Refs #7169
Merge branch 'feature/7169_DGS_file' into develop