Updated commits from modules/completion/external and modules/history-substring-search/external