[REQS-609] Added curves and surface