Fix regression with admin.activesubclasscode
Merge branch 'sonata/master'