Merge "Handle invalid destination address gracefully" into oc-dr1-dev