merge from 6.0.1 branch
2 files changed