Resolves STREAMS-59
Merge commit 'a230b963fd6a5e6e40f78a355330d5c1da9097b5'