Fix for ZEN-9263, ZEN-9258