Manual merge of pull #808