Ticket #31413 Properly import consolidated local calls