Merge branch 'nd/get-oid-with-context-returns-an-enum'