ZEN-10167 and ZEN-10168