Merge "Revert the usage of sCompatibilityModeEnabled" into sc-dev