Changed for ESB 4.9.0