Merge "Respect remote aliases"