Merge pull request #193 from indexa-git/17.0-mig-001-ge

Merge pull request #193 from indexa-git/17.0-mig-001-ge #662