Only one enrolled class causes exception when saving
Merge remote-tracking branch 'origin/master'