=pro make samples optional
Merge pull request #16451 from 2m/wip-optional-samples

=pro make samples optional