Merge branch 'mh/write-refs-sooner-2.2' into mh/write-refs-sooner-2.3