Merge branch '1851-favorites-pagination' into 'develop'