Merge branch 'jc/check-ref-format-oor' into maint