am 06a84554: Merge "Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""" into klp-modular-dev

* commit '06a8455421978d06597de2abfccabef928d06056':
  Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""