Added KITT-235 and fixes for route-to-reconciler mod