OF-810 RFC 6121 Routing Compliance Fix