Merge branch 'vs/completion-branch-fully-spelled-d-m-r'