manual merge of pulls/371