Merge "Remove deprecated ToMakePath calls"