Improve autocomplete
Merge branch 'master' into edge