Merge branch 'cb/maint-update-ref-fix' into maint