Merge branch 'ab/get-short-oid'