[streaming] Merged commits from main repo & License header fix