Merge "Making Route Distribution Synchronous"