Added additional check to see if workspaces in ADS. re #9240
Merge branch 'feature/9240_sans_add_files' into develop