Milestone1 rework

Merged Adrián Piaček requested to merge Milestone1_rework into main

Merge request reports