HOTFIX - Mantis Ticket 5211