Merge "Allow ServerCertValidation usage on S module" into sc-dev