Merge pull request #490 from jkczyz/2020-02-initial-routing-sync