EB-7587 - Restored the changed that overrides by previous version