Merge "Use SimpleSchemaContext instead of EffectiveSchemaContext"