Merge pull request #16574 from civicrm/5.23