Merge branch 'dany/light-class-type-reference'