3.4.x

Is this a right place to make a pull request??