Merge pull request #20931 from civicrm/5.40