I have changed the names of some other aux variables, which could be the cause for the clash in MR 26148. The changes are tested for any further clashes.
Edit by @bernius: to solve ATR-26148