Added bug fixes for CLINPORTAL-7184