STREAMS-197 | Added imports left out merge