Merge branch 'rf/completion-config-commit'