merge of '5205c4bbe6c22164549099dae6ac17f506611c18'