Merge branch 'parser-fixes' into 'v1-process'

Fixes after reprocessing #689 #690

See merge request !487
12 jobs for v1-process in 41 minutes and 55 seconds (queued for 7 seconds)