Chrono: merge fixe for #9337.

[SVN r86655]