turn of indexing on annotation properties
Merge branch 'upgrade-infrastructure' into docker