Merge in change for issue 7525.