Manual merge of #67