Merge pull request #8023 from remitamine/extract-formats