removed "FIXME" comment
Fix various ESO issues.
Merge remote-tracking branch 'origin/issue284-2' into issue284-2
Adjusted remote ESO test to the latest changes.