Merge branch 'cb/ci-freebsd-update' into maint