Merge branch 'jc/fmt-patch'