CRM-13550 - API - Port 2nd patch from 4.2