Fix for ZEN-9297 issue