Add macro expansion in defclass
Merge branch 'master' into pr/705