Merge pull request #6715 from tobiasd/20190221-cs