Add missing fetch size attribute to datastores
Merge branch 'master' into production