merge of '42aef61ee7960f3e8df22a2a931c9a46a49531ab'