pull request for 140114-11116

Hi Vaibhav, More changes for pull request 140114-11116