impl/EZP-22217 minor change /will be rebased