Wrestling with autocomplete too often to keep it enabled
Merged in master branch