Merge 'origin/main' into 'v1.2.2' for merging back into main

Right now, main is broken, we want the state from v1.2.2.

Did:

git checkout v1.2.2
git merge -s ours origin/main

Will then push the resulting merged commit to main.

Author: joanise