Merge branch 'kb/co-orphan-suggestion-short-sha1'