Merge "Fix stack reference is not updated if the task is organized" into rvc-dev