Merge branch 'rt/completion-help'