Manual merge of #218