Fix primitive set building and add support for "merge_geometry" option