manual merge of #37