Added for CLINPORTAL-7698