[sr-dev] git:master:db6eae95: drouting: use core fixup helper functions