Merge branch 'nd/stream-to-archive'