rebase to 265563 and disabled the root caused tests