Merge pull request #636 from tobiasd/20180704-cs