merge of '5a2399197df237f82ef95027a49f2340a2303958'