Fix for ZEN-13071