[ros-diffs] [sserapion] 47468: sync to trunk (more or less r47450). Will normalize in next commit.