Merge develop into feature/stream/develop

Please do not merge it yet.