[ros-diffs] [dreimer] 39110: Apply this to PS too