Merge "Address some comments for class flags"