Merging Pull Request #2400