Merge pull request #1927 from JBosch:issue3409