GEOMESA-106 PR changes