Merge change 6848

* changes:
  Minor class loading optimization.