Merge branch 'root-class-warning'