[ros-diffs] [ion] 20936: - Move some assembly functions around in better suited locations.