Make branch release_34_7
Merge branch 'master' into release_34_7