Merge pull request #20741 from civicrm/5.39