- CRM-11798, this will also be checked in separately in svn