merge main into dev

Sandra Westerhoffrequested to merge
main into dev

This reverts commit afed1cc2.

Conflicts:

package.json

yarn.lock

Merge request reports