Merge branch 'cb/http-push-null-in-message-fix'