Merge "Fix build - the stack frame is too large."