class units load issue resolved
Merge pull request #1740 from ssushma/dev-branch

class units load issue resolved