Changes to prevent merge conflicts from pull request.