Final cleanup for VIX-520 - Zig Zag patching support