Merge branch 'hotfix/prismo-twitterapi' into 'develop'