Merge "Add class status for resolved erroneous classes."