Merge changes I8293baab,I63e248bd