Merge branch 'rt/completion-tag'