[Evgeny, Jason] change_data breakes to batches using batch IDs
[Evgeny, Jason] change_data breakes to batches using "finished" message as it was before previous commit