merge of e2a2d86