modtool: added tagged_stream block as an option
Merge branch 'master' into next