DO-4875 and DO-4702 issues has been fixed.
DO-4702 issue has been fixed.
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge pull request #755 from shivalinga/dev-branch

DO-4875 and DO-4702 issues has been fixed.