Merge "Fixed NaN exceptions in EdgeEffect" into sc-dev