RIA-102 fix started
RIA-103 Fixed
Merge branch 'feature/RIA-102' into develop
RIA-105
RIA-104 changes
Merge branch 'feature/RIA-105' into develop

Conflicts:
	README.md
Conflict Resolved