Merge 24.07

Bug fixes, design improvements