ZEN-5557 (round 2)