Merge branch 'parser-fixes-v1.0.8' into 'v1.0.8'

Parser fixes v1.0.8

See merge request !656
15 jobs for v1.0.8 in 41 minutes and 22 seconds (queued for 5 seconds)