Merge "Do not allocate so much memory on the stack." into klp-dev