#4133 reworking routing config