impl/EZP-22163 Updated specification