manual cherry pick merge
Merge branch 'master' of github.com:otcshare/automotive-message-broker