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

aydunsrequested to merge
ayduns/dev:ayduns-master-patch-98705 into master

Merge request reports