Merge "Remove edge slop support."