Bug 10052: QA Followup