Merge branch 'mark-as-read' into next