Merge "remove the "memcpy" hack" into kraken