Merge pull request #5149 from tobiasd/20180530-msg