Merge branch 'jc/ll-merge-binary-ours' into maint