Merge pull request #16596 from civicrm/5.23