Merge pull request #20894 from civicrm/5.40