[backport-1.3]: eso should not be enabled by default but it should be based on requirement

Issue #2239 (closed) needs to be backported to 1.3.x