Merge branch 'rs/read-ref-at'