Merge branch 'cp/completion-negative-refs' into maint