Merge branch 'hotfix/add-in_reply_to_index' into 'develop'