merge of '34c552438e2e3487f826b3198c4bdf7e1445e77e'