Merge "Use correct stack height when bypass enabled." into sc-dev