[OE-2933] bugfixes related to a ticket raised by ratna