Merge branch 'jk/format-patch-number-singleton-patch-with-cover'