Crm 14492

As discussed in - https://issues.civicrm.org/jira/browse/CRM-14491