Merge pull request #16117 from mshabunin:fix-hist-args-34