Merge pull request #16604 from civicrm/5.23