Merge "Remove duplicate directory variables with the same value"