merge from 3.4
3 files changed