Merging pull request #2199