Manual merge of e8364e6 from #382