Merge pull request #24131 from sandreenko/addAReproTest