Only ping API if needed.
Merge branch 'hotfix/api_limit'