Merge "Skip the conflict test cases with fixed volume feature" into pie-cts-dev