Merge branch 'release/0.5'
Only ping API if needed.
Merge branch 'hotfix/api_limit' into develop