May be worth using https://github.com/joomla/joomla-cms/pull/32510 if and when it's merged.
May be worth using joomla/joomla-cms#32510 if and when it's merged.