Merge branch 'jc/merge-ff-only-stronger-than-signed-merge' into next