merge of '00ee303d8d48b4b6a0a7480dea928c8d02252f80'