[ros-diffs] [jimtabor] 45650: - Add patch back after sync with force.