Bug 974381 - review feedback