Merge changes I6abbe506,Ibfd12197