Merge proposals

ros_snap_test has no merge proposals.