[1.6.x] Fixed #21338 -- Allow to use the same class name for proxy model...