Merge pull request #23082 from agileware/CIVICRM-1958