Added: checkpoint tag support for by-stream mode