Merge pull request #16001 from agileware/CIVICRM-1383