Merge pull request #12032 from Paul92:mser-sample-improvments