Merged a bug fix to update6 branch
This tag has no release notes.