Merge "Update the EdgeEffect API" into sc-dev