Merge "Remove over-aggressive stack movement." into klp-dev