'mxEvalDS' amended.
Bug corrected.
Merge branch 'master' into jisaeva
Bug corrected