Merge remote-tracking branch 'origin/feature/6160_mask_tab'
Merge remote-tracking branch 'origin/feature/6905_script_repository_download_folder'
Merge remote-tracking branch 'origin/feature/6881_save_mask'. Re #6881
Correct the error.  Refs #6918.
Merge branch 'feature/6918_correct_error' into develop