merge of '8ccf578d98540e0fe880015d1158e3f2e2d5fada'