Merge pull request #13966 from agileware/CIVICRM-1168