merge of '16882b53b725e8d7bfbf2d2909cfbf1f3a8a90fc'