Pull Request E819 by odalvi,amsonmal,apnair