Merge branch 'stable-3.7' into stable-3.8

* stable-3.7:
  Log publishing of stream events in message_log file

Change-Id: I38f451bc8b4baa643278c33c8c9611dc33162d0d