There is an alternative: I can keep the current macro in our code base and create a new one with another name. The proposal here is basically to get rid of this macro. I’m globally refactoring the way it works (which is the root cause of the bug in Loading...) with different arguments.
The reason why I want to just get rid of it is that with my work we’d keep a velocity macro without using it in XS and so without any further testing on it. For something that is probably never used outside of XS.
Also XWIKI-16623: Make password changing consistent (#1157) · xwiki/xwiki-platform@99e9389 · GitHub seems to have moved the macro from XWIKI-16623: Make password changing consistent (#1157) · xwiki/xwiki-platform@99e9389 · GitHub but not introduced it, right?
Indeed I’ve been a bit fast in my check. Was introduced in XAADMINISTRATION-114: Extract successful registration message to a ne… · xwiki/xwiki-platform@fa1e1a7 · GitHub but was only defined in XWiki.RegistrationConfig back then, not in a velocity template, until the change I mentioned.