Merge branch 'rs/patch-id-use-oid-to-hex'