merge main to gui application #317

Closed joelparks112 closed 4 weeks ago