Merge pull request #8991 from MrPetovan/task/restore-autocomplete-comment