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