Bug #123
Merge remote-tracking branch 'origin/dataseries_workpackage_03'