Merge changes Ib2cb36cd,I50dec908