Adding resolve class name by model
Merge branch '1.1'