Merge in change for issue 7525.
Merge branch 'master' into issue7590