Merge pull request #412 from Agasper/experimental

* Fixes for changes in DirectEve v1.330.4904.26383