Merge branch 'rs/ref-update-check-errors-early'