Yesterday
merge from console_autocomplete_fix2