Merge branch 'sb/parse-object-buffer-eaten'