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)