Merge in shelf_router / shelf_router_generator.