re #9525 CreateSampleWorkspace added
re #9525 resolve warnings
re #9525 resolve warnings
Merge remote-tracking branch 'origin/feature/9525_CreateSampleWorkspace'