[streaming] Automerge error + License fix