STREAMS-131 | Updated per code review comment