merge of '31db29464dd50bf11190fd9efbeaece3d3e83025'