Merge pull request #5784 from tobiasd/20180922-cs