Merge branch release_34_dev

Merge branch release_34_dev