Merge branch 'hotfix/0.11.0.8'
Get user records in batches, remove unneeded clause.
Only do time calculation once.
Merge branch 'hotfix/0.11.0.9' into wdtk