Last ST40 commit
keep Unit test function and uniformized GeometryUtil
Adding the tag @unefficient