bring up to mainline 3.0.94