WP-1338: QA changes with Kerri.