Today
Merge from triangle_planter (and latest main)