12 Commits (fix_autocomplete_port)