Fix for ZEN-10282