Merge branch 'hotfix-oldstyle-classes'