OPAL-1955 OPAL-1962 ES upgraded and data files location set