Merge branch 'exciting-parser' into text-parser

8 jobs for text-parser in 34 minutes and 10 seconds (queued for 2 seconds)