Merge pull request #20260 from agileware/CIVICRM-1733