Merge branch 'jk/patch-ids-no-merges'