VPE/BrowserSim patches for 4.1.1.alpha1