Ticket #23307 - Update Hiero export