merge of '3f551b06dbb61a62224fe6d9f3affb063932e0f1'