EPD-217: Better handling of strategic route notifications