update patch for bug 877262 to address review comments
start to address review comments for bug 793996