Merge branch 'pw/sequence-rerere-autoupdate' into maint