Merge "New feature: FEATURE_SECURITY_MODEL_COMPATIBLE"