Merge branch '1139-feat-strip-message-id-in-log' into 'master'