aerOS cherry pick

Vasilis Pitsilisrequested to merge
aeros-cherry-pick into main

Merge request reports