Merge branch 'fix-buffer-parsing' into 'master'

Make buffer parsing more robust

See merge request !3
4 jobs for master in 1 minute and 17 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #16685
test2.7

00:01:02

passed #16686
test3.6

00:01:03

 
  Deploy
passed #16687
pages

00:00:13

passed pages:deploy

00:00:00