Merge changes I6029bd48,Ie8eb4152