manual merge of: pull #455