-Backport of elapsed time interface changes.