Add resource infinite loading issue resolved
Merge pull request #1199 from ssushma/dev-branch

Add resource infinite loading issue resolved
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch