Merge "Preserve compatibility for makePathElements"