Fix ZEN-13953