Merge pull request #22673 from agileware/CIVICRM-1924