CRM-9419 QA Changes