Fix: ZEN-9036 in progress