Merge remote-tracking branch 'upstream/develop' into PLFM-2992
Cannot rely on just creator anymore
Do total count correctly for limit and offset in query
Merge remote-tracking branch 'upstream/develop' into PLFM-2992
test fix
Merge pull request #1545 from marcel-blonk/PLFM-2992

Do total count correctly for limit and offset in query