Merge pull request #16728 from civicrm/5.24