Brought in 3.4 source code