Bug 10096 - (follow-up) various QA improvements