Fix ZEN-12865 to unblock QA