[ros-diffs] [sserapion] 35989: Merge 35977. Fix 64 bit portability issues. Thanks ekohl!