Fix compiler class
Merge branch '2.1'