merge of '9bdc778b4db6a77bfd983ea418ef07f57f411bcd'