Issue #1975106. Update API to v3 where possible. CRM-13854 will need to be resolved for full API approach?