Merge branch 'jc/bindiff' into next