[ros-diffs] [cfinck] 40164: Sync all non-RosCMS stuff to r40163