Merge branch 'main-pc' into knj/test_testcase_compatibility