Bug 974439 - review feedback