Merge branch 'rs/oidset-on-khash'