Feature 507 / Merge latest release 2.2 into develop

[PhotoNomad0]

Describe what your pull request addresses

• adds latest changes in GWE release 2.2 into develop branch with rebase

Test Instructions

• can test with https://deploy-preview-610--gateway-edit.netlify.app

[codecov[bot]]

Codecov Report

All modified and coverable lines are covered by tests :white_check_mark:

Comparison is base (24d3931) 51.64% compared to head (e1f2875) 51.64%.

Additional details and impacted files

```diff @@ Coverage Diff @@ ## develop #610 +/- ## ======================================== Coverage 51.64% 51.64% ======================================== Files 43 43 Lines 1336 1336 ======================================== Hits 690 690 Misses 646 646 ```

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.