Merge "Fix stack transfer bug."