Use the change here https://github.com/joomla/joomla-cms/pull/21901 as a baseline for the other core components.