Merge branch 'tp/completion'