merge of '6cae67d8eb2b6d2a39c35027eca7695c4c5fcea4'