merge of '0d25e98bdf0c1d029587a346db9cb19346e4c78c'