Fix an issue with the class status pop-up
Merge branch 'class-flags' into mit-prod