Merge branch '2626_escape_autocompletion'