added api_type where required
Merge remote-tracking branch 'origin/feature-api_type'