Fix mark page as read when only one page
Handle version conflicts caused by duplicate requests
Merge branch 'master' into feature/es