main to dev before refreeze

Matan Hooryrequested to merge
main into dev

(cherry picked from commit 04f7ff56)

Merge request reports