Updates for https://github.com/civicrm/civicrm-core/pull/31352

ayduns requested to merge ayduns/dev:ayduns-master-patch-98705 into master Oct 24, 2024