Bug 958440 - address review comments