Merge branch 'stable-2.7'

* stable-2.7:
  Refactor highlighting patch sets that have drafts