Partial fix for review comments captured in bug 365387
9 files changed