Bug Fixes for:
CLINPORTAL-7169
CLINPORTAL-7358
CLINPORTAL-7360
CLINPORTAL-7354