Merge branch 'jc/fmt-patch' into next