change from slakshma2
checkin from slakshma3
merge from slakshma2