Bug 888804 Handling review comments