Merge "Fix the set member size check error"