Merge changes I46c903b7,I7128529e into v2.0