This issue has been resolved by Ticket 5681