Merge pull request #16797 from civicrm/5.24