merge of '6347af950ec1a0ff98214a570984c55df668fad7'