Merge branch 'cw/completion'