CRM-13965-qa-fixes