manual merge of PR closes #712