Merge branch 'modest-3-0' into part-to-stream-in-plugins