Merge branch 'link-headers-chats' into 'develop'