Merge pull request #22884 from civicrm/5.47