Fix for ZEN-10367