Merge "Fixed an issue where the qs position was wrong while bypassing" into sc-dev