am da69fdbb: Merge "Fix buffer allocation"

* commit 'da69fdbbeb79885a3c063a2017bd6d2848fcc312':
  Fix buffer allocation