Merge branch 'rf/completion'