Merged changes from pull request