Do not remove the import of a used class...
Merge branch 'feature-fix-paginator' into develop