Merge branch 'fix/retweet-language' into 'develop'