Merge "Fix a bug that enabled Subtype ID can't be saved propery."