Merge branch 'main' into va/wmc_tool