Merge branch 'main' into knj/test-ci-setup