re #9525 resolve warnings
Merge branch 'feature/9525_CreateSampleWorkspace' into develop