syncing 3.4 master with 3.4_Release