Merge pull request #2623