Merge "Use new API for shouldBypass" into sc-dev