Merge pull request #831 from tobiasd/20190322-sv