manual merge of #450