Merge pull request #97 from mayurjadhav/RG-144

Worked on RG-144
Merge pull request #98 from mayurjadhav/RG-144

Worked on RG-144
RG-152 Fixed notice error found during QA
Merge pull request #99 from Edzelopez/RG-152

RG-152 Fixed notice error found during QA
RG-153 Worked on issue RG-153
Merge pull request #100 from Edzelopez/RG-153

RG-153 Worked on issue RG-153