Merge branch 'chat-message-pagination' into 'develop'