sync 3.4 dev