Merge branch 'jc/fmt-req-fix' into maint