BO : Fix for CLINPORTAL-7006