Merge pull request #16684 from civicrm/5.23