Merge branch 'main' into ci/fix-rendering-tests-with-peaq-2