Update path computation for better interoperability
Merge