Merge "Canonicalise path before extracting relative path" into sc-qpr1-dev