Merge branch 'shooter_loop' into merged_loops