Merge "Increase the size of guard for Stack Overflow (x86_64)"