Merge branch 'rs/sort-oid-array-thread-safe'