fix for indexer-exec
Merge branch 'master' into jupis