Merge new routes into dev