[#95981] Changes to add geometry places shapes.