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