STREAMS-210 | Fixing commit issue