Edit solution/define_classes
Merge branch 'hotfix/1390393672'