[ros-diffs] [dreimer] 41827: Apply Colin's changes to the PS Scripts, too where needed.