Optimize path lookup

Closes #3564478

Merge request reports

Loading