Merge pull request #20476 from agileware/CIVICRM-404