Merge branch 'hotfix-paginator-typehint'
Merge branch 'develop'
Merge branch 'develop'