[ros-diffs] [cmihail] 52390: [MSAFD] - merge r52389