Merge pull request #2687 from jeis2497052/master