[ros-diffs] [sserapion] 36862: Merge to trunk HEAD(r36856)