Merge changes I26f3edb0,Iba714851 into new_text