Merge pull request #6892 from tobiasd/20190316-issue6891