fix batch indexing and prepare for next release
18 files changed