Merge with 'origin/master' to resolve conflicts with #932 (stream)