STREAMS-135 | Updated per code review notes