Merge pull request #24117 from civicrm/5.52