Merge branch 'cb/binary-patch-id'