Merge pull request #12998 from agileware/CIVICRM-990