Merge branch 'twitter-api-blocks' into 'develop'