EZP-22210: Refactored injected merge settings