[ros-diffs] [akhaldi] 60653: * Addendum to r60650. CORE-7471 #resolve