Merged autocomplete to master