Merge "Edge extension effect: extend surfaces" into main