Add top tip in Switch on custom route
Merge remote-tracking branch 'origin/DevMap' into DevMap