Fixes for:
CLINPORTAL-7356