merge of '574770392742c88b4d3a04f82d9c482f3b529ac7'