fixes ZEN-15717