merge of '132be09ee353f798eadc984f8f09e27e68180850'