Merge branch 'main' into fix-sanitizer-error-plc