Merge "Fix cinderv3 rerty"