Merge branch 'sprint/JollyJellyfish.fix.discovery.feeds.screen.not.opening.last.page' into 'master'

[Sprint/JollyJellyfish] (fix) entities service should return at least local entities if it can't fetch all the page

Closes #1066

See merge request !257