Merge branch 'mb/reword-autocomplete-message' into maint