Fix for ZEN-10939