prepare for landing patches for bugs 812618 and 887273
landed the patches
more fixes for bug 760876