Merge branch 'cp/completion-negative-refs'