Fix for ZEN-10265