tmp fix of manager class name
Merge branch 'upstream-master'