Merge branch 'dl/format-patch-doc-test-cleanup'