CSPACE-6057: Addressed most of the issues described in CSPACE-6057 JIRA issue.