Merge pull request #6623 from tobiasd/20190210-msg