Merge pull request #3973 from mono/small-perf