S4-103 and S4-76 Fix stream ids and remove app ids
Merge branch 'S4-103' into dev
S4-126: Remove duplicate log

Patch by Aimee Cheng