XD-671 added registry-aware router