EZP-20576 - Added check for legacy mode