Ticket 5505 : Modify code - condition added for task