Review needed

[Benura Abeywardena]

Hi,

I've opened some PRs addressing some issues opened in Jira. I would like to 
hear suggestions/improvements if need to be done from the community.

Thanks & Regards,
Benura Abeywardena