Merge "Add a create_router utility function"