Merge changes I6bf15cd4,If96f651a