[ros-diffs] [rnaumann] 74501: [EXPLORER] Addendum to r74500. Those 2 commits belong to CORE-11498