manual merge of #304