Merge shuttle route fix in submodule.