merge 'create-route' into 'map'

Change-Id: I0ae3222063950d7f430f698732f0c7eb546ba5c5