Merge pull request #16884 from civicrm/5.24