EZP-20948: Fixed IOLegacy handler + tests