Manual merge of #212