Addresses last comments on ATR-19277.
Tagging @jmontejo, @aranzazu -- this was discussed on the ticket, and should not affect any compilation or important tests, so mentioning in case they want to rush this in. Also @cvarni @ckaldero FYI.