TODO: Do we need to do anything for https://github.com/civicrm/civicrm-core/pull/31116 ?

To investigate: https://github.com/civicrm/civicrm-core/pull/31116