Merge pull request #14877 from eileenmcnaughton/hist_rep