Fix for JIRA CIDEVMI-1580.