Merge "Improve clip support (add intersect, union and replace.)"