[ros-diffs] [ion] 16792: - Some more PSDK compatibility fixes