Rolling termination working.  Fixes #8501.
Rolling termination working.  Fixes #8501.