Merge "Add edgeEffectType attribute and type property" into sc-dev