updates from 6.4 branch
5 files changed