am 6dbcebd0: Merge "Always release a buffer" into klp-modular-dev

* commit '6dbcebd0430e026fd5d99ba4b4f005bfaa9b8e2b':
  Always release a buffer