manual merge of Greg pull request