impl/EZP-22298 refactored template