[ros-diffs] [cgutman] 38869: - More memtrack fixes