Merge branch 'hotfix/more-minor-fixes'
fixed old api call
Merge branch 'hotfix/fixed-old-api-call' into develop