Merge remote-tracking branch 'jcamins/bug_8281_qa'