Manual merge of #600