Bug 14583: Updates based on initial feedback
2 files changed