rebased the patch for bug 873848. updated the patches for bugs 812618 and 883649