merge from 6.0 branch
4 files changed