Merge changes If79fa865,Ia6652643