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