Merge branch 'kw/patch-ids-optim'