Merge pull request #21250 from agileware/CIVICRM-1820