Merge pull request #1996 from suryanarayanakb/dev-branch

Resource count and question count changed