BZ-9741 updated routing