Final commit by amsonmal,okdalvi,apnair

E819 Pull request by amsonmal,okdalvi,apnair