CRM-15683 Tim's proposed changes