Bug 28773: (QA follow-up) Additional changes