Merge to Development branch - Working on API limits