Merge branch 'mh/update-ref-batch-create-fix' into maint