Merge 86392 from trunk. The spirit change was not applied because the file is not present in branches/release.

[SVN r86489]