Merge branch 'jk/diff-driver-binary-doc' into maint