Addendum to r72417. CORE-11858 #resolve