Merge change from pull request 6