Merges in launch file changes