Addresses comments to pull request 4372