Develop to main

khoi huynh anhrequested to merge
develop into main

8/11/24

Merge request reports