EZP-21213: review remarks