Add support for DNS options Upstream-commit: 5cbcbfc03cc11de8d58dd0977327bb6a8cfc9fa4 Component: engine