Merge branch 'bg/maint-remote-update-default' into maint