Merge pull request #16537 from civicrm/5.23