* Addendum to r71184. CORE-9111