Fix for ZEN-14317