GEOMESA-106 more PR changes