Merge branch 'mh/write-refs-sooner-2.4' into maint