[ros-diffs] [mf] 16397: fix compile errors