[ros-diffs] [gvg] 13119: Fix crash during boot