Merge pull request #10264 from terfendail:createsamples