Merge branch 'cy/completion-typofix'