Merge main with gui and application branch #335

Closed joelparks112 closed 2 weeks ago