Fix for JIRA CIDEVMI-1580 - Attempt #2.