Infinite load issue resolved in classsetup
Merge pull request #1760 from ssushma/dev-branch

Infinite load issue resolved in classsetup