Added fix for CLINPORTAL-7332