Fixed bug in DataDelegate
Merge branch '3.1.x' into beta/4.0.0