EZP-22564: refactored: DRY with base implementation