Merge pull request #18504 from mikedn/comp-small