[PATCH] WE-21 for ray_cs