Rebuild after EZP-22017 implementation