Merge pull request #2349