Fix data generator.
Merge branch 'master' into feature-server-side-filtering