Final merge

Erdianti Wigarequested to merge
development into main

As an alternative to the class folder, or can be use for reference

Merge request reports