Merge changes I9eb1a3e2,I212e61d2