Merge "Use the correct switch for AR bypass" into sc-dev