[ros-diffs] [hbelusca] 64317: [NTVDM]: Improve diagnostics.