Merge branch 'followup/twitterapi-no-rich-text-field' into 'develop'