Merge changes I688d84e5,Icce01201