Merge "Fix the test case fail with PIA V2" into main