Manual merge of pr #26