Addendum to commit #16651.