More RICH Speed improvements

Back ported from master MR !138 (merged)

Merge request reports

Loading