Fix for ZEN-13543