CRM-13176 - Patch taken as a part of core