Merge "Fix SECURITY_MODEL_COMPATIBLE tests" into sc-dev