Merge Latest changes from staging to main
This MR is created in order to merge all changes on staging to main with the purpouse of create a new release v2.0.0
This MR is created in order to merge all changes on staging to main with the purpouse of create a new release v2.0.0