Merge branch 'en/ort-cached-rename-with-trivial-resolution'

"ort" merge backend improvements. * en/ort-cached-rename-with-trivial-resolution: merge-ort: handle cached rename & trivial resolution interaction better