Merge "Revert "Edge extension effect: extend surfaces"" into main