Merge pull request #651 from naumenkogs/2020-06-routing-data-improvements