Merged in pull request