Fix for ZEN-15396 issue