Improved file formats support and tests, and fixed an error

6 jobs for !11 with dev in 5 minutes and 27 seconds (queued for 2 seconds)
latest merge request