Merge part-to-stream-in-plugins branch work also into master.